Disable ido-everywhere when ido-mode is off

* lisp/ido.el (ido-mode): Disable the effects of 'ido-everywhere'
when ido-mode is turned off.

diff --git a/lisp/ido.el b/lisp/ido.el
index 5716c6ff44206ad49e174477904eff362486805b..ad71d468cb41f13c81dd95a6dca15b71d00a2ddd 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1549,7 +1549,7 @@ This function also adds a hook to the minibuffer."
         ((> (prefix-numeric-value arg) 0) 'both)
         (t nil)))
 
-  (ido-everywhere (if ido-everywhere 1 -1))
+  (ido-everywhere (if (and ido-mode ido-everywhere) 1 -1))
 
   (when ido-mode
     (ido-common-initialization)